Merge from emacs-24; up to r111307
authorGlenn Morris <rgm@gnu.org>
Thu, 28 Feb 2013 06:30:48 +0000 (22:30 -0800)
committerGlenn Morris <rgm@gnu.org>
Thu, 28 Feb 2013 06:30:48 +0000 (22:30 -0800)
commitaae5165f4da23b5a8cc8cc2d8e87bafaed751982
tree737bfc7c73164a76997e7c9485f7a485deb2e5cd
parente2d0e437eef6cb85288a0d1ff589acf9b60a9189
parent9a945fab5b9a462853f20c0724b00994dd30e664
Merge from emacs-24; up to r111307
doc/emacs/ChangeLog
doc/lispref/ChangeLog
doc/misc/ChangeLog
doc/misc/tramp.texi
etc/NEWS
lisp/ChangeLog
lisp/org/ChangeLog
src/ChangeLog
src/w32.c
test/ChangeLog
test/automated/python-tests.el